bitkeeper revision 1.1236.55.1 (425175fbBCdCc-UwZwZJiL3qUUqQsQ)

Fix and use x86_64 config bits.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/Kconfig b/linux-2.6.11-xen-sparse/arch/xen/Kconfig
index 1c2ba9b4a2b0fa2369b78b228472addd62063ab3..1d88c61d13356283110a26a1a4fd22d884e268e0 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig
@@ -153,6 +153,10 @@ if X86
 source "arch/xen/i386/Kconfig"
 endif
 
+if X86_64
+source "arch/xen/x86_64/Kconfig"
+endif
+
 menu "Executable file formats"
 
 source "fs/Kconfig.binfmt"

diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig b/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig
index 32cee5b84e10cb7da00527feca99771e56199fc1..0dccbb441234c54ad542a78564457a3ddbc2b0ab 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/Kconfig
@@ -8,31 +8,14 @@
 #
 
 menu "X86_64 processor configuration"
-       depends XEN_X86_64
 
 config XENARCH
        string
        default x86_64
 
-config X86_64
-       bool
-       default y
-       help
-         Port to the x86-64 architecture. x86-64 is a 64-bit extension to the
-         classical 32-bit x86 architecture. For details see
-         <http://www.x86-64.org/>.
-
-config X86
-        bool
-        default y
-
 config 64BIT
        def_bool y
 
-#config X86
-#      bool
-#      default y
-
 config MMU
        bool
        default y
@@ -105,10 +88,10 @@ choice
        prompt "Processor family"
        default MK8
 
-config MK8
-       bool "AMD-Opteron/Athlon64"
-       help
-         Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs.
+#config MK8
+#      bool "AMD-Opteron/Athlon64"
+#      help
+#        Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs.
 
 config MPSC
        bool "Intel x86-64"